switch: Use gdk_window_new_input()
authorBenjamin Otte <otte@redhat.com>
Mon, 17 Oct 2016 22:21:45 +0000 (00:21 +0200)
committerBenjamin Otte <otte@redhat.com>
Mon, 17 Oct 2016 22:22:35 +0000 (00:22 +0200)
gtk/gtkswitch.c

index e136f675d0267b3069e8a152a5801699959c54ac..c0735328b4380625a0469b5b1ced1365186d4eaa 100644 (file)
@@ -492,8 +492,6 @@ gtk_switch_realize (GtkWidget *widget)
 {
   GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
   GdkWindow *parent_window;
-  GdkWindowAttr attributes;
-  gint attributes_mask;
   GtkAllocation allocation;
 
   gtk_widget_set_realized (widget, TRUE);
@@ -503,24 +501,15 @@ gtk_switch_realize (GtkWidget *widget)
 
   gtk_widget_get_allocation (widget, &allocation);
 
-  attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.wclass = GDK_INPUT_ONLY;
-  attributes.x = allocation.x;
-  attributes.y = allocation.y;
-  attributes.width = allocation.width;
-  attributes.height = allocation.height;
-  attributes.event_mask = gtk_widget_get_events (widget);
-  attributes.event_mask |= (GDK_BUTTON_PRESS_MASK |
-                            GDK_BUTTON_RELEASE_MASK |
-                            GDK_BUTTON1_MOTION_MASK |
-                            GDK_POINTER_MOTION_MASK |
-                            GDK_ENTER_NOTIFY_MASK |
-                            GDK_LEAVE_NOTIFY_MASK);
-  attributes_mask = GDK_WA_X | GDK_WA_Y;
-
-  priv->event_window = gdk_window_new (parent_window,
-                                       &attributes,
-                                       attributes_mask);
+  priv->event_window = gdk_window_new_input (parent_window,
+                                             gtk_widget_get_events (widget)
+                                             | GDK_BUTTON_PRESS_MASK
+                                             | GDK_BUTTON_RELEASE_MASK
+                                             | GDK_BUTTON1_MOTION_MASK
+                                             | GDK_POINTER_MOTION_MASK
+                                             | GDK_ENTER_NOTIFY_MASK
+                                             | GDK_LEAVE_NOTIFY_MASK,
+                                             &allocation);
   gtk_widget_register_window (widget, priv->event_window);
 }